From: Sergei Organov <osv@javad.com>
Date: Wed, 13 Jul 2011 07:58:34 +0000 (-0700)
Subject: * lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2892
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=642326b3344a3bbc7447aa154b33212cde1397ce;p=emacs.git

* lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fd1984b107..dda3efb1f1e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-13  Sergei Organov  <osv@javad.com>  (tiny change)
+
+	* vc/vc.el (vc-revert-file):
+	Don't set file time-stamp in the past.  (Bug#5181)
+
 2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* files.el (after-find-file): Give a better error message when
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 796311f8f66..6704a43e59b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2428,7 +2428,7 @@ its name; otherwise return nil."
    (list file)
    (let ((backup-file (vc-version-backup-file file)))
      (when backup-file
-       (copy-file backup-file file 'ok-if-already-exists 'keep-date)
+       (copy-file backup-file file 'ok-if-already-exists)
        (vc-delete-automatic-version-backups file))
      (vc-call revert file backup-file))
    `((vc-state . up-to-date)